Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mmu unify - task1 #1724

Closed
wants to merge 79 commits into from
Closed

Conversation

AngelaGonzalezMarino
Copy link
Contributor

Merge of sv32 and sv39 MMUs. Parametrization strategy followed for new parameters.

correct also ASID_LEN parameter propagation
Correct value assignment req_port_o.data_be and req_port_o.data_be for the sv39 case.
AngelaGonzalezMarino and others added 20 commits December 15, 2023 17:04
… hypervisor extension. Update all submodules to new data types as first step"

This reverts commit 257f6e0.
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

// tlb_update_t update_ptw_itlb, update_ptw_dtlb;
tlb_update_cva6_t update_itlb, update_dtlb, update_shared_tlb;

logic itlb_lu_access;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[verible-verilog-format] reported by reviewdog 🐶

Suggested change
logic itlb_lu_access;
logic itlb_lu_access;

Comment on lines 112 to 113
logic [PT_LEVELS-2:0] itlb_is_page;
logic itlb_lu_hit;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[verible-verilog-format] reported by reviewdog 🐶

Suggested change
logic [PT_LEVELS-2:0] itlb_is_page;
logic itlb_lu_hit;
logic [ PT_LEVELS-2:0] itlb_is_page;
logic itlb_lu_hit;

logic [PT_LEVELS-2:0] itlb_is_page;
logic itlb_lu_hit;

logic dtlb_lu_access;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[verible-verilog-format] reported by reviewdog 🐶

Suggested change
logic dtlb_lu_access;
logic dtlb_lu_access;

Comment on lines 117 to 118
logic [PT_LEVELS-2:0] dtlb_is_page;
logic dtlb_lu_hit;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[verible-verilog-format] reported by reviewdog 🐶

Suggested change
logic [PT_LEVELS-2:0] dtlb_is_page;
logic dtlb_lu_hit;
logic [ PT_LEVELS-2:0] dtlb_is_page;
logic dtlb_lu_hit;

Comment on lines 120 to 122
logic shared_tlb_access;
logic [riscv::VLEN-1:0] shared_tlb_vaddr;
logic shared_tlb_hit;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[verible-verilog-format] reported by reviewdog 🐶

Suggested change
logic shared_tlb_access;
logic [riscv::VLEN-1:0] shared_tlb_vaddr;
logic shared_tlb_hit;
logic shared_tlb_access;
logic [riscv::VLEN-1:0] shared_tlb_vaddr;
logic shared_tlb_hit;

core/mmu_unify/cva6_mmu.sv Outdated Show resolved Hide resolved
core/mmu_unify/cva6_mmu.sv Outdated Show resolved Hide resolved
core/mmu_unify/cva6_mmu.sv Outdated Show resolved Hide resolved
core/mmu_unify/cva6_mmu.sv Outdated Show resolved Hide resolved
core/mmu_unify/cva6_mmu.sv Outdated Show resolved Hide resolved
core/mmu_unify/cva6_mmu.sv Outdated Show resolved Hide resolved
core/mmu_unify/cva6_mmu.sv Outdated Show resolved Hide resolved
core/mmu_unify/cva6_mmu.sv Outdated Show resolved Hide resolved
core/mmu_unify/cva6_mmu.sv Outdated Show resolved Hide resolved
dtlb_is_page_q <= dtlb_is_page_n;
end
end
endmodule
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[verible-verilog-format] reported by reviewdog 🐶

Suggested change
endmodule
endmodule

core/mmu_unify/cva6_ptw.sv Outdated Show resolved Hide resolved
Comment on lines +189 to +191
assign req_port_o.data_be = riscv::XLEN ==32?
be_gen_32(req_port_o.address_index[1:0], req_port_o.data_size):
be_gen(req_port_o.address_index[2:0], req_port_o.data_size);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[verible-verilog-format] reported by reviewdog 🐶

Suggested change
assign req_port_o.data_be = riscv::XLEN ==32?
be_gen_32(req_port_o.address_index[1:0], req_port_o.data_size):
be_gen(req_port_o.address_index[2:0], req_port_o.data_size);
assign req_port_o.data_be = riscv::XLEN == 32 ? be_gen_32(
req_port_o.address_index[1:0], req_port_o.data_size
) : be_gen(
req_port_o.address_index[2:0], req_port_o.data_size
);

core/mmu_unify/cva6_ptw.sv Outdated Show resolved Hide resolved
core/mmu_unify/cva6_shared_tlb.sv Outdated Show resolved Hide resolved
Comment on lines +204 to +205
for (int unsigned i = 0; i < TLB_ENTRIES; i++) begin
// we got a hit so update the pointer as it was least recently used
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[verible-verilog-format] reported by reviewdog 🐶

Suggested change
for (int unsigned i = 0; i < TLB_ENTRIES; i++) begin
// we got a hit so update the pointer as it was least recently used
for (
int unsigned i = 0; i < TLB_ENTRIES; i++
) begin
// we got a hit so update the pointer as it was least recently used

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
core/mmu_unify/cva6_ptw.sv Outdated Show resolved Hide resolved
core/mmu_unify/cva6_ptw.sv Outdated Show resolved Hide resolved
Copy link
Contributor

✔️ successful run, report available here.

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant